From ad814509a4bb71cbf5865db1552273d7b47d0536 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 31 Mar 2018 21:01:47 -0400 Subject: [PATCH] font chooser: Align level value names In the backport, I used the plural for variations, and that is a better name, so use it here too. --- gtk/gtkfontchooser.h | 12 ++++++------ gtk/gtkfontchooserwidget.c | 5 ++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/gtk/gtkfontchooser.h b/gtk/gtkfontchooser.h index 204c6ec49a..d04026ba37 100644 --- a/gtk/gtkfontchooser.h +++ b/gtk/gtkfontchooser.h @@ -49,7 +49,7 @@ typedef gboolean (*GtkFontFilterFunc) (const PangoFontFamily *family, * @GTK_FONT_CHOOSER_LEVEL_FAMILY: Allow selecting a font family * @GTK_FONT_CHOOSER_LEVEL_STYLE: Allow selecting a specific font face * @GTK_FONT_CHOOSER_LEVEL_SIZE: Allow selecting a specific font size - * @GTK_FONT_CHOOSER_LEVEL_VARIATION: Allow changing OpenType font variation axes + * @GTK_FONT_CHOOSER_LEVEL_VARIATIONS: Allow changing OpenType font variation axes * @GTK_FONT_CHOOSER_LEVEL_FEATURES: Allow selecting specific OpenType font features * * This enumeration specifies the granularity of font selection @@ -59,11 +59,11 @@ typedef gboolean (*GtkFontFilterFunc) (const PangoFontFamily *family, * ignore unknown values. */ typedef enum { - GTK_FONT_CHOOSER_LEVEL_FAMILY = 0, - GTK_FONT_CHOOSER_LEVEL_STYLE = 1 << 0, - GTK_FONT_CHOOSER_LEVEL_SIZE = 1 << 1, - GTK_FONT_CHOOSER_LEVEL_VARIATION = 1 << 2, - GTK_FONT_CHOOSER_LEVEL_FEATURES = 1 << 3 + GTK_FONT_CHOOSER_LEVEL_FAMILY = 0, + GTK_FONT_CHOOSER_LEVEL_STYLE = 1 << 0, + GTK_FONT_CHOOSER_LEVEL_SIZE = 1 << 1, + GTK_FONT_CHOOSER_LEVEL_VARIATIONS = 1 << 2, + GTK_FONT_CHOOSER_LEVEL_FEATURES = 1 << 3 } GtkFontChooserLevel; #define GTK_TYPE_FONT_CHOOSER (gtk_font_chooser_get_type ()) diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c index bd08336b3d..ada82ac78c 100644 --- a/gtk/gtkfontchooserwidget.c +++ b/gtk/gtkfontchooserwidget.c @@ -865,8 +865,7 @@ gtk_font_chooser_widget_init (GtkFontChooserWidget *fontchooser) priv->font_desc = pango_font_description_new (); priv->level = GTK_FONT_CHOOSER_LEVEL_FAMILY | GTK_FONT_CHOOSER_LEVEL_STYLE | - GTK_FONT_CHOOSER_LEVEL_SIZE | - GTK_FONT_CHOOSER_LEVEL_VARIATION; + GTK_FONT_CHOOSER_LEVEL_SIZE; /* Set default preview text */ gtk_entry_set_text (GTK_ENTRY (priv->preview), priv->preview_text); @@ -1643,7 +1642,7 @@ gtk_font_chooser_widget_update_font_variations (GtkFontChooserWidget *fontchoose g_hash_table_foreach (priv->axes, axis_remove, NULL); g_hash_table_remove_all (priv->axes); - if ((priv->level & GTK_FONT_CHOOSER_LEVEL_VARIATION) == 0) + if ((priv->level & GTK_FONT_CHOOSER_LEVEL_VARIATIONS) == 0) return FALSE; pango_font = pango_context_load_font (gtk_widget_get_pango_context (GTK_WIDGET (fontchooser)), -- 2.30.2